From: James Antill <james@and.org>
Date: Wed, 18 Jun 2014 06:57:19 +0000 (-0400)
Subject: core: Fix g_file_get_uri/get_parse_name for non-root ostree files
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1171
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d4d4cbda7afd99d69e2d18e4edb82053f06cdffc;p=ostree.git

core: Fix g_file_get_uri/get_parse_name for non-root ostree files
---

diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index 49857099..454b523b 100644
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -495,12 +495,13 @@ ostree_repo_file_get_uri (GFile *file)
   const char *path;
   char *uri_path;
   char *ret;
+  OstreeRepoFile *root = ostree_repo_file_get_root (self);
 
   path = gs_file_get_path_cached (file);
   uri_path = g_filename_to_uri (path, NULL, NULL);
   g_assert (g_str_has_prefix (uri_path, "file://"));
   ret = g_strconcat ("ostree://",
-                     self->tree_contents_checksum, "/", self->tree_metadata_checksum,
+                     root->tree_contents_checksum, "/", root->tree_metadata_checksum,
                      uri_path+strlen("file://"),
                      NULL);
   g_free (uri_path);